Merge branch 'file-conflict2' into 'master'
authorBenjamin Otte <otte.benjamin@googlemail.com>
Tue, 2 Apr 2019 20:05:12 +0000 (20:05 +0000)
committerBenjamin Otte <otte.benjamin@googlemail.com>
Tue, 2 Apr 2019 20:05:12 +0000 (20:05 +0000)
Rename all settings schemas to avoid conflict

See merge request GNOME/gtk!705


Trivial merge